Trying to put as many singletons in the code as I can; doesn't help...