Add event mostly working
Merge remote-tracking branch 'tikalk/master'