added @todo comments