Implemented tracking service, phase 1 finished