1st iteration of refactoring TrackFit