Papercuts

Not ready for a merge
This patch covers https://www.pivotaltracker.com/story/show/63559926