FIX: working commandhandler
some commit