New classes added. Some have to be tested.