Added half of the subscribe functionality
Merge branch 'subscribe'