Something
Work on detection.py
Merge conflicts