This wraps the previous functionality, though there are some iterator changes we might still want to bring over.