DO NOT MERGE: Fixing Entities

Don't wory, prints will go away :)