Added completion. Not working. To do: add shell commands