First try at completion for dub