separated out track from executed track
Merge branch 'master' of github.com:aduston/shakesy
Improved tests and removed some unnecessary code