Part of an X axis upgrade, some Z axis progress