WIP playing with OO for Subscriptions

Change-Id: I4944c57709a0cb1e3faff38e63934d1462d50bdb