Made many changes, making new branch.
Show is working for quanities.