Fixing my TODO list