Bugfix: Frickin iterators
Optimize ALL the things