Re-added entity id system for now

I realized that it wasn't old bloat. Derp.