Added completer. Tested ok on pc.