Attempt to have a more forma TODO list