Fixes for entity changes

Fixed a bunch of stuff I broke by encapsulating entity so that it'll
compile for tuesday