2.0

My attempt to deal with class Throws/Catch. Throws seems OK, Catch seems a bit wrong