Finished off the NaiveDetector, now to fix up the concrete classes, then make a smarter detector.