TradHeli: ReBuilding the Non-Leaky-I-Term logic.  Tested and works so far, but I don't think it's done yet.