Refactored some more of the base goodness into base