Updated list of commands to be implemented.
Merge branch 'master' into upstream
Grabbing Chris's changes