Got global store working as well