Start of kits.
Merge latest from master.
Kits are sorta working. Almost.
Merge with master.