Events part of issue #86 is working