started adding location services
merge conflicts?