2nd iteration new model classes
nadine merge