- Fix bug
- Implement scrubber with progress