Updating to use new event system
Merge branch 'master' of github.com:Synapseware/babylight