adding working routes
Add Joaquins branch and fix merge conflicts.