Done more work on the Event creation.