Lots of optimizations, done with ProgressBar. WIP.

Still dirty.