Reintroduce the progressbar; Make everything better