Preliminary models
Merge branches 'models' and 'master'