rename
can now recompile
reformat, eliminate singleton pattern