(#19) Progress... finally

Converts to the preferred route.  Working on trimming down the
information we are receiving since it is currently too much.  Will be
pushing once I have a complete solution.