More progress on login server code