adding working routes
merge with joaquin branch