first commit
Adding progressbar
fix conflict
Remov test text