merging TrackController with master project