Location suggestion system has been moved over to the new structure.

Now just the route querying system needs to be done.
Missed stuff from last commit