Minigame Refactoring - Part 3