Table entity is getting kinda complete
Merge branch 'table-entity'