Timer service and tests are looking good. Just need to polish.