Shop finished

Pending changes made in sessions