CommandHandler Update 2

It's now actually working, used a temporaily solution tho.
It coming there!