Added more map stuff
Resolved conflicts