Working through shop stuffs

Mainly basket