Refactored data requests to take advantage of abstract models
Finished routes data requests