Changed a lot to get outgoing-P2SH.  Start testing...