Switched a few things around for optimal printing. The current data will need redoing, as David's print statements wound up in there.