Moved to 2 different kinds of entities. NonWrapped (doesn't include access to scripts) and wrapped.