Helpers and event work

Signed-off-by: Simon Bailey <simon@newtriks.com>
Merge pull request #4 from newtriks/master

Helpers and events