Updated the TODO with a few other tasks