did some more work on the DSL version of Event.