basic functionality
Merge branch 'EntityPT1' into Development