WIP refactor from subscriptions to task_subscriptions