still reorganizing some server registration code