let's undo the controller stuff a bit