Experimental rewrite

Watertight folds is letting a few rows fall through the cracks but otherwise looks sane.