Began work on rewriting class.