More work on C.H.U.G.G. finder.