most of model structures done
Merge branch 'tmp' into mrg
Merge branch 'master' into mrg