SCA-14 #resolve

some other commit stuff here