Working to get the new router implemented and finally get rid of the RouteParser elements.