Start the implementation of a simple diff
Forgot to commit these
Fix broken merge