setting up routes
fixing minor merge issues, setting up routes