some cleanup and add contact class
some cleanup and add contact class
contact resolver in progress