Massive re-working of the uri/loaders.