Added shop item. reorganized code (again).