Solomon: including changes. Currnelty working on adding due date