initial commit
initial working version
Merge timer/master