Add combos and properties and shit