Started work on the tracking
Added some mocking