ENH: Further integration with the data broker.

Not quite working yet though...