Further refactoring of flavors
Riggin flavor
Instatiate derived Flavor