work ongoing
Refactor track code out