This is still in this file, but reorganized from latest commit.