commiting first stage of subscriptions code