The Kirby Refactor