Event system

We need to merge this with master before presentation. Any one have reasons not to?