Making progress --- will be soon time to start testing.