Generalized the object/event/model framework; have not fully updated all models