Some maintenance of filenames
Stubbed 'now' view
Some unfinished work on the 'now' view