Ongoing crossref templates work

https://www.pivotaltracker.com/story/show/61098350