fixup! big funday refactoring