Merge pull request #48 from nolanfilter/Nolan

WIP new control scheme. Functional but hacky