incomplete work, handing off to helgi most recent changes