Finishing story [https://www.pivotaltracker.com/story/show/65589914]