Reverted back to mealy machines for carrying state between events