Issue #36
- Major changes to error handling to set up for error checking for
Issue #2