Lots of Event cleanups. Controller is much slimmer, complexity moved to Event. At some point, that complexity still needs to be boiled out somehow.