added the rest of the classes of part 1b to correct heirarchy.