Some cleanup based on @enebo 's recommendations.
Continue filling out diff functionality. Getting closer.