HYHULL-188, HYHULL-189: work in progress