Ugh...shenanigans

Conflicting pull requests (Myself and Jamie) so we did a manual merge,
and forgot to run Mapmerge