Starting on new qa logic