Now using SceneEvent for my new events and removed old files.  I'll do a pull and manually rebuild and test the new version once all of the additional handlers are in just to tidy things up