Add iteration count
Add OO version of kiplings
Remove commented out code
Rename some variables to make code closer to the narrative