add TODO's for untested code