Updating to use classes and parse amounts and units