More sources

Also untested. I imagine there's finagling/munging that needs doing for a few sources, but I'm not sure what that entails.