Feature change routes

Starting to refactor existing routes as per #396 

Now ready for merge!