What started as just cleaning up Fuzzer turn into a HUGE refactor.  Needed to happen though