Major restructure, now much cleaner
Merge branch 'master' of https://github.com/smartin015/Jarvis