Beginning work on error msg simplification