Start expression rewrite. Move gen options into separate structure
More expressions