Moved the Marker Code out...