HWS now runs through without hanging or errors, but haven't worked through whether it's correct or not...