3040 in its new home. Mounted the PSU and TinyG (thanks @Riley_Porter_ril3y ) on the verticals of this desk. Jogs successfully. Obviously the laptop perched on the drill press is not a feasible solution - I will install a Pi but I do not trust the wifi connectivity in this area. No endstops or PWM control of the spindle yet (manual controller with potentiometer), have touch plate but have not hooked it up yet.
Should add that some of the pics are from last night so you are seeing various stages of wiring before completion.