First draft of CountdownView
Merging in master