Horror - mess in progress, read below

This was too painful to deal with, passing it over to Stephen to take
over.