First attempt to autocompletion
Fix some completion issues
Fix some completion issues
Fix some completion issues
Fix some completion issues