Julian development

Make changes to include baskets