Starting to clean up the server class structure, utterly broken, don't checkout