Merge pull request #1 from nicolejpaz/sync_changes

Sync changes
Restricted routes to only ones that are needed.
Merge pull request #5 from nicolejpaz/routes_fix

Routes fix