Updated the TODO file and some of the base files