Progress toward 3-axis

Update to code toward 3-axis, not complete