Major updates. Added ordering of store list.