first pass
cleaned it up some
Merge branch 'pullout'