Added all files
confirm commit
added ongoing resolver logic