Refactored a bit, added progress bars and toasts