Updated for singletons and methods

@mpillsbury asking for review first this time :-)