More work done on fixing the Event Receiver, It is still pretty much broken though.