class vs singleton_class based approach.  v2.0.0