An attempt to resume work on this...