New kit
Merge remote-tracking branch 'np/kit'
Revamp the Kit