improved event management

Signed-off-by: Duke Stephenson <andrew.stephenson@mcubedlabs.com>