Improved exiting of class scope to allow Static functions to almost work.
Github software is failing - recommit of previous.