Routes

Did I fix the merge conflicts?