Added TODO list and updated features (Check TODO)