Fleshing out tools and map format