Rx development

This worked in testing.  @tcstewar do you mind code reviewing and merging?