major updates to routes and templates