error messages put to the screen
Need to bring in Jeff's work to ensure they sync well

Merge branch 'master' into Kevin
Merge pull request #5 from ztnark/Kevin

error messages put to the screen