More GEN-2 progress

GEN-2 landings (mostly) work.  Reloading an entity from the database
isn't there yet, nor is there support for the other two types of GEN-2
interactions.