A few more tweaks to WiresBuilder before regressing back to try some other ideas