Infrastructure/tent build

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