Added todo tracking