Changes to the entities system. Setting up for a complete reboot of the project.