Trying to get completion to work properly...