new code on the models
Merge branch 'master' of https://github.com/peterantkowiak/SSF-workflow.git