adding some todo comments