Model design#2

zrasi wants to merge 2 commits intomainzrasi/sql:mainfrom

model-designzrasi/sql:model-designCopy head branch name to clipboard