more WIP work on server goodies