closes #93 - complete rework of the way proxy events are dealt with
rebuilt