Before refactoring to dictionary for more efficient marker matching
pre-shuttle integration
Weather Controller and new icons