* Diff mode now working.
* Need to think through entire interface..