Should be complete!

Time to merge into DBSDetector repository