Added rough draft of detection & tests