Yes, that is my plan. The gear that it comes with is one kit and will be stored separately. I have had lenses cleaned of fungus in the past and not had a problem with it returning. I might, though, get someone who knows what they are doing to have a look.

Cheers