Add: progress tracking stuff to everywhere
Fix: oops