Reverted some changes, turns out I forgot about the master base controller and models.