First set of changes: Add, MarkToDo, Remove works