more progress on the tdd part