Phase 1 of the adventure refactor