added TODO notes