Rework WVDetection to be a separate class and simply be included
Authored by: marci4 2020-06-11
Parent: [c2b811]
Child: [4374a5]