Full infrastructure for resolving events (I hope)