Refactor to tie tracker to milestones