Added lots of headers and started working on map