WIP: Continue work on processing entities