Moved to using notion implementations of location and store.

 - Updates saws at same time.
 - This is first step in a larger process to clean these concepts up.