More stuff in main!
Merge pull request #1 from Computerology/taintedwind

More stuff in main!