spatial map edit
Merge branch 'jon' into sprint9