Refactor/tracking service

closes #11