This is the meat of the PR.