Major architecture change, cocktail index currently broken