Continue work on singleton / metaclass