Added callback wrapper helper

Signed-off-by: Tom Wright <tom@inflatablecookie.com>
Rebuilt event system

Signed-off-by: Tom Wright <tom@inflatablecookie.com>