Subscription stuff mostly working
Forgot to fix the typo Alex pointed out.