pre-refactor commit

working to eliminate spatial_map.hpp as it stands