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

...ng the accessor methods
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.