some progress on Store