Map merge try 2?

Github is kind of butts