Added router
Started working on user view, cleaned things up
Not sure how this went missing...