Feature/now

See #9