added some todo comments