Updated Diff Iteration

This is based on the work done by @brianmario in #103.

This comes with a few, very basic tests.