Working on Map generation. Code is clearer and works.