contacts to sessions
cleanup and better setup dx