Yes, changing the use of Strings for location everywhere in the code base is definitely a much larger change. But you don't need to do that part now. Just change the part I mentioned.