adding in Bryan's changes manually
Commit Bryan's testing and exception load.