Merge cleanup branch

Merge cleaned up countdown code