updated models, restructured, added new fields for timing