adding todo
updating readme and TODOs
Merge branch 'dev'