Safety commit.
Progress, but mouse gets held up as part of the motion constraints. Too many interruptions today.