Move absorption to setting Tons of minor improvements to the code Id types re-numbered to leave space