Revamping Research Outpost : Part I

Description shall go there
Changelog
Merge pull request #1822 from dylanstrategie/Mapping

Revamping Research Outpost : Part I