updated with routes and shit