Feature/basket flux