Better handle getting new markers

#44