Move debug code
Merge branch 'subscriptions' into testing