Dramage maps

Merge map stuff