Finally got completion mostly working sort of