OK is the plan to add them on this PR or create an issue to be addressed in
a following PR? I have no preference as long as it happens before we have
tons of code/function.