can we implement this instead of leaving the todo here?