Lots of changes where we transition from axis names to varX, varsY, varsPivot, etc. to allow for empty axis shelves