Progress on classes