Worked on https://www.pivotaltracker.com/s/projects/1037972/stories/78365202