Work on subscriptions - very buggy