Adds additional request types and improves Match
Merge branch 'WIP' of github.com:GP-S/HOTS into WIP