sucess condition roughed out
merge conflict resolved