Add a now helper
Extract helpers into its own module