working on routes
old uncommited changes