Final changes to get iteration to work.

This should move up to release 1.0!