@bwilkerson Re: this TODO, do you have any advise?