Subscriptions refactored, tests passing (version discussion?)