Get rid of the singleton_class stuff. Create a builder object for creati...

...ng the accessor methods
Line is too long. [133/80]