Refactoring into Constructor, added simple Markers with popups