Start implementing more complete diff functionality.