Working nicely for Dan, with voxel-rescue.  Left watch hooks off for the moment, will need to turn them back on before merging with the main branch.