Emergency Commit

Cannot debug problem with event system. Scrapping the EventSystem and
rewriting.
Rewrote EventSystem

Bug is still there - new event system should be logically sound. Need to
trace problem elsewhere.