REFACTOR: Switch to MakeMe from Bit