Prep for separation milestone

About to rip apart the entity code. This is my safetynet if it all goes
wrong.