Entity work (wip)