Vanchi/radar96 restore subscriptions

@samshull Bring back subscriptions and presence states.