fixes problem in intake model taker property
begins refactoring model:intake
merges with remote