'Tis the final part of ze merge. We really need some kind of system for the map freeze though.