more collapsing of code to eliminate unused member variables. ( who knew it would be so hard to add pre-set variables to calls.)