Starting refactor and using the routes to push data