Select dots

For #56 and #50. Will auto merge this in like an hour but just putting it here for bookkeeping purposes.