separated out modes
Merge branch 'master' of https://github.com/majpaul/cs237finalproject