Revert back to old looping system.
Merge pull request #16 from akbiggs/loop-reversion

Revert back to old looping system.