Adds Keyword Support

Adds Keyword Functionality. I'm still getting the hang of pull requests and I'm not sure how to remove certain files from commits, so I apologize in advance for the clutter.

If you could remove the Command Update commit from the request, then everything should be ready.