Continue to experiment with a more robust event system

2013-09-23, Phil Hannent