Added TODO and description