Added Detector Class, need to make output functions for it