Done w testing and added functionality to find subscriptions