Keenan - Small refactor and testing mobile map stuff