Map WIP v2

Possible map drawn up, needs additional input