Move to new models and streamline router