Ckozak/source subscription

I'd still like to test this some more, and we need to resolve the subscription migration issues.

Please let me know if there's anything that looks off.