added new models, simplified forms, preparing for new model types.