I believe this code will have to change anyway when we merge cv-rework... wondering if its worth fixing here...