New structure stuff
Merge pull request #3 from zbtirrell/develop-stuff

New structure stuff