Somewhat messy, still closer to working
Merge branch 'master' of https://github.com/VelociousTurtles-Inc/Turtles