Major changes to Services.js

*Passing Variables to functions to avoid polluting global namespace
*Adding Markers with infoboxes`