Axes are now numbered

Code needs to be simplified and refactored