Fixed #33 (Move Event -> OutputEvent translation into the State)