The great bad refactor!