More progress serverside, nearing completion