flesh out track classes a bit