Continued work on sales/sales_model