further work on server class