Refactored a bunch of code, fixed collisions, tweaked networking, no more position in Entity