Added a TODO to QA