Development

Merge bare bones development into master, primarily so there is something to show. This isn't release quality yet.