Started separating node finder logic