More work on routes and saving data