Issue 5 - Merge into Development Branch

This should merge subscription capabilities into the development branch.