Begun rewriting several classes.