half baked commit upgrading to the new router