Progress toward controlling generated machines

Some problems keep this a work in progress.