Moved todo notes to preamble