Add wind commented code
Cleanup to branch