Committing so I can work on this later. Also added docstrings to the command handler.