Fred - Removed first pass of a solution to Quantity