More progress on the REST api