New classes. Need to fix null pointer exceptions