@swankjesse if you know of a better way for safe iteration here, or that safety isn't an issue, lemme know.