Some work on doAssign
Fixed merge
Fixed SearchDecl and added DoAssignField