Added TODO and ideas