initial merge of locations code