fixed router api call and lots of shit

Spencer and Drew fixed router, collections and view- re factoring code.