Generate new machine just about works