Committing all major functionality
Merge branch 'master' of https://github.com/calrk/calrkPlans