First model mockup
Merge branch 'model-mockup'