3/4ths working, control logic migrated