Factor loader into a database storer and a batch loader

We disagreed about this offline