Would prefer to do after this PR, as general lib function.