Initial Main-Structure Commit
Merge pull request #2 from joe-vanleeuwen/main-structure

Initial Main-Structure Commit
merge master into flack