More progress on REST2, but still not ready for testing