major refactor, squashed more bugs than a jungle challenge in I'm a celebrity