Reshuffle, break things. But feel much better about the abstraction route now.
Merge branch 'master' of https://github.com/mattpbooth/Autotracker