I started a few more things on https://www.pivotaltracker.com/story/show/64259684