Sorting out the plumbing

oooh errr