add test, implement countdown
Merge branch 'work'