andrew's changes for review
bleh
sigh
Breakout initial with pgxtra modification