Last potaowire additions oand some re-org of Gabe's work.