countdown works
Merge branch 'work'