Class changes... previous commit may be better for evaluation at the moment