yet more rearranging, mostly done.