Entity 1.2
Merge branch 'firsttry' into tickets