Reworking completer to use the ast extend to find the right thing to complete