More comments, making sure UI only ever gets added once, selected -> checked