Finished changes to machine.go