Added notes/TODO