About halfway through eliminating the base parameter to almost everything.