wip/gdmap/patches
