Plugged various route paths back together. I may have missed a couple but all the feature tests are still passing.