Shoudl conform to the new API now. Now to move on to the routes