Added ability to subscribe, need to change this later