Rates refactored. Added lower and higher edge. Added dates to order for filtering.