Some changes with new features in mind
Merge branch 'master' of github.com:VelociousTurtles-Inc/Turtles