Begun converting Map to use axial co-ordinates