Updates, including changing to just 2 classes.