p2 and p3 now have detection. Part 1 done.