Supply model barebones
Merge branch 'develop'