Update the todo list
Add some logging
Move method
Remove unused logging
Add more informative error messages