I agree, will create a separate issue and reference it in the TODO in the code.