Lots of work on the new ref set form...