Still trying to fix entities *sigh*