Decoupling map marker code, #83