more progress on speedy TDD