new models, modified role, added clean methods to models
Merge branch 'remodel_validators' into develop