Need to update and set up resolve statement