Edited TODO list, time to fix that