Update to rake and crops, add data source model