Begin refactor of line items