Making progress on the subscription controller
More work on subscription model