#25 finish up the collection rewrite