refactor schema to add choice class
Maker menu working reasonably well WIP