Revert "added two more classes"

This reverts commit 512b58e31ab98d2bc066ac5b07500997cf7f344e.
Revert "initial incomplete implementation committed to continue work on another computer"

This reverts commit b12a8e1c2e6a9fbe56020ce150993ebd11180cbb.