Fixed some bugs, added the initial extender logic, moved some
things over to freqDetector