working
fixed some testing
Merge branch 'moving_locations_to_ucellars'