map builder stuff
merge