Committing GUI Editor port WIP