Updating TODOs
Now in a "good" working order.