Pull Request Fix

Removes TODO from Keywords Branch to fix the pull request as well as the
Command additions.