bit o cleanup
hooked up all the final plumbing, this baby's ready to be tested