added some todo tags