Added KitOp

Cleaned up CommandHandler
Added KitOp - will be removed in future commits