Added about half of the functionality to assignment 6.
Still working on autocompletion