Making due date calculations into variables
Adding due date to model
refactoring extension
SORT