added some todo statements