Working on Locaiton tagging