Removed uber mode setting. Removed uniqueNumber hack, and replaced with a more robust class generator.