Refactor, jds, more stuff accessible from the event