Added todo notices