Map generation closes #3