Iteration branch pull request for review.

Remove this hard coding.. This should be passed by the consumer with some defaults.