Refactor.
Hitting postgres directly, better object store.