More refinement. Started base for tracking'services.