Moved changestate to machine. Got rid of unnecessary calls to get and
set methods within the machine class.