Machines: Getting more of the machines implemented, still a WIP