#198584 inital 6.x update- thanks largely to Placinta, with testing by catch, webchick, and me and some additional tweaks by me