Changed everything so that it is using SharedStore