Matt's time view added as view, still needs logic to be merged in
Moved some stuff around
Merge pull request #22 from zakavila/feature/adding_time_view

Feature/adding time view