finished locations (i think)

I believe i finished locations
further testing will reveal this truth
need to do items still (errors occuring)