Added todo's for issues.