All this crazyness will be gone soon.  Big progress on action_events branch on this.