Added a next command
Begun rewrite of completion script