Added better todos