WIP: Entity refactor continues.