WIP: Continuing work on Entity refactor.