Refactor countdown to use a callback method on countdown complete instead of events
Merge with Ed #9