Started adding kits, remove extra classes.