Some postgres work left in another branch while working on 0.5.2