Added a lot of stuff to make the initial map