Added a basket repository.
Minor fixes