Yes.  I was identifying some things in action_events that I would need, but in the interest of smaller commits I was trying to just get mostly the loading stuff.  There were al lot of smaller changes that I pulled from reference_types into this branch because I thought we might want to do that first (the migration was still holding us up).

Since that smaller stuff was always in both branches, we have merged most of it already.

Then there is a bit more in the action_* branches.  I've got two of those active now, but I haven't quite figured out all the pieces yet.  These are now downstream of obj_render, so I want to get that in first.  (action_reference and action_events are the two branches).