Change from function specific static var to class var
Rename routines to make it a little clear on what they do