New singleton class added as commented out for reference