Partial completion of Map generation