More pretty dots. I'm closing in on some general functionality