Work towards fixing the client revert.
Fixed error's on loading with Entities. Need to re-add them.