Added todo comments