Progress bar refactorization, Cancel not working yet