further work on client/server split