Changes in overall design
Implemented MachineRunner