Added Kits Support
Fixed all bugs in Kits