First commit

This is the model package
Merge branch 'Frost' into dev