frustrated and finished part iii
Merge pull request #1 from kdurr/tinas_spot

Combining part III