Some plumbing in place