Added some notes/todos etc