further additions to class definitions made. making progress.