359 make now optional

Fixes #359.

Includes changes from the original PR (#360), with the refactoring/cleanup split out and every so slightly powered up.
Should this read 'omitting Now'? If I add back in `Go` then I get a compilation error.