Nearly completed entityEngine refactor