CommandHandler Update

Simple update for the CommandHandling.
Unfinished!