major reorg in process... (sorry for the large commit). parses successfully on testnet, but more testing needed