Added back some of my stuff that was stashed.