added some notes for TODO