Basket, authentication and basic logic added