WIP: making X and Y axes
Axes in place
Merge remote-tracking branch 'origin/master' into make_axes
Enter and update working for transitions