adding stuff done by Tim

This is the stuff done by timothy c widman