Checkpoint: I lied, NOW I'll be refactoring stuff...