shot in the blue
Merge branch 'wing' of github.com:sookee/oa-mod into wing
merging and cleanup