refactored
Merge https://github.com/dogfox209/WindmillContractors