Autonomous mode and some cleanup
Merge pull request #10 from kajames/working2

Autonomous mode and some cleanup