Big updates

Loads of work, mainly with regards price/currency management and basket building/management