WIP Refactor generator hat