Include the exception name
Put the basic structure in place for the diff tool