Subscription handling 95% complete