Feature change routes

Opening PR for discussion. Starting to refactor existing routes as per #396 

Not ready for merge yet!