Magic number new map! Closes #36 #37