Multi-purpose pull request

-Completes #17
-Fixes subscription associations