Rx

Changes to move subscriptions over to Rx