factored templates
Merge remote-tracking branch 'origin/master'
clock is now working