entities now cool and reflective
Merge branch 'dbtesting'