Revert "Refactor: Kill the loop"

This reverts commit 32be87fbce778c1564b27189826a020ca9a59839.
Sneaky bug, ffirst not first