New global classes, commented out modules coded under old design guidelines