add TODO for subscription tracking on listener