Model v2 completed with testing
Model v2 and test
Jus another commit
Merge branch 'common' into albert