move track into track class