Pinpoint Waldo

Updated marker and Service implementation