All entities now save on exit, code is even more complex, player is not saved separate from other entities