Revert "Revert "Added Quantities and Convertion Rate""

This reverts commit 26b48ed245f917b9d8c79461230b9b34587c9ada.