More syncing of code between eSpace and Fez

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