Switched to general completion func
Moar elegant.