WIP merged connections, but need to do probes

- Also, a shape error.