Add "completed" and "working on" functionality