almost done subscriptions, lots of tidying up, time to commit
micro change