first pass at "singletonizing" the Output class and adding tests