feel free to add this as a line in the code itself so we don't lose track of the todo when it's merged.