Locations progress

Locations array is building successfully upon. Retrofitting Locations in
place instead of a vector of location.