update routes

sorry guys, the routes tee and i had conflicted a bunch and it was sort
of confusing merging