That should do it for connections

Pathfinding is in but untested. Committing as its late and I don't want
to stay up all night.