Working on routes
second commit