Working on the locations component