Refactor map transitioning in an attempt to fix #178 - need to test