Finished a very rough draft of the main diff method.