In progress -add location