Merge pull request #27 from cnd11/master

Mostly working
working track controller separation