pg stuff
Migrated to pg I think
merged