added TODO and some notes