commenced large ass refactoring of map module
added stops collection and select controls