Rearranged the Dimension methods a bit, and made some private.