All server entities now refactored (hopefully)