Seperate Track from TrackFit, TrackFit object refactored yet