Working on postgres integration, need commit for pull.
Fixing merge conflict
Integrate postgresql.