Lots of work for #1.  Still need to test and update nav links.  Still need to create tests for timeline and tasks view.