Refactor. Change to model.
Merge
Add