TODO & Update Readme file

Lets check the todo sometimes :D