Initial work on Store