Adding beginnings of command line parsing, and shuffling things around.
Merge branch 'develop'