Classes modified and ready to test.