revert accidentally committed file
new class impl — final step, first part — basic class tests passed (failed 93 tests of 344)