Post-Meeting Commit April 7

Buildable with most aspects, ready for putting on tablet