Started on exception handling

Left a build error in there to see where I am at in that process.