LOT of changes - Now show items from other shops work!