Adding todos
Delegating to the source when an error happens