Picked this up again - progressed on XZ handler