working on event stuff more