Added new structure.  Moved functions to plumbing.