Model v2 completed with testing