Refactor work needed

Revert back and pull timerService back into ctrl