Added some notes (TODO's)