Fixed up the routes, still need to fix test cases