Messy commit, sorry - current progress on scheduling an event.
Merge branch 'master' of https://github.com/bethlakshmi/GBE2