Added a few TODO - notes