Putting singleton module back in, apparently whatever it does, it does
well enough