Completion is now working a bit