DO NOT MERGE: Fixing Entities

Hunh. More info, please?