Saving WIP
Added subscriptions