start of something terrible
implemented error checking
implemented error checking
implemented error checking
Merge branch 'master' into Eric