Added a TODO for vigi stubborn bitch :imp: