Updated TODO list after discussion with tackat
Update TODO list again