full rebuild of jacob's code following our customer's complaint about unmaintainability of the map