crude match loop
Cleaned up reviews a bit.
Merge branch 'mcbranch-dos'