More work on spells and finnished ControllerHandler.