The source files have 3 TODOs. Maybe it's a good time to fix some of them or move them to separate issues? <img width="1013" alt="screen shot 2018-02-23 at 12 16 39" src="https://user-images.githubusercontent.com/566463/36591825-7dced14c-1893-11e8-8aa6-af6f2bcd718b.png">