Modularity, style, a real clock.
Fixup error handling.