Merge from lookitstony to jaymedavis to complete #139

This merge pulls in the multiple subscription work from lookitstony.

Currently, all tests are passing.

Let's get this pulled so we can close out #139.