Begin hacking away at the data model for all of the new track stuff...