Addes some TODO as reminders..