Version 3

Add list, diff & difftool commands. Lots of cleaning up.