Selection Corrected

Several classes added.