Added TODO for moving 'q' check