Add paging
Add department, and logic for actually using modified values