TSP and cluster wired together

Still messy, but it is doing something right :)