george-th : Refactored (yes at a hack day) the controllers