WIP Update Event Functionality

... that it's more portable