Halfway through refactoring so that an Axis is a Container