First round of classes added. World class modified.