Added skeleton for track
Store refactoring to remove unnecessary method. Fixed test run