Started integrating map

Guess my next step is GUI