More MFC stuff I don't want to lose if I have to back out.