Some maintenance of filenames
Stubbed 'now' view