Attempt to rewrite fetching... so we actually keep fetching.

The old way never updated the streams from the API.
Moving logging calls so they can more accurately report things.