Progressss
Fixed some loading
Smarter collection