Added network stuff and attempt to fix Entity