replacing singleton with Model object. <grumble>