Updated and initial work on client store