added TODO comments outlining what we need