adding branch tdshap
adding my branch
moved file
changed stuff
drew a picture
Merge pull request #1153 from tdshap/add-tdshap

Merging PR from @tdshap