maybe @jtreminio can share his opinion on this.

I think we should land postgresql to get this great PR out of the door and afterwards do some refactoring PRs to make this more smooth.