Saving work
Added testing code for surf_map