Generalized kit

Hopefully this is going to be the last commit.