some random refactoring... Figures starting to draw themselves in minigames, but little too drunk to go on