add timers
Shorten filenames
rough code - split concerns and simplify
tweak messages