WIP almost done, needs some love

Work on this ticket:

https://www.pivotaltracker.com/story/show/77450554

needs to be finished off.