Add NOTE and some TODOs