Server class fixes
test
screwed around