Finish area mapping

yay!