beginning to refactor subscriptions controller
commiting before swiching branches