Moved to finish event over timeout. Now let's see if we can internalize this.