is this TODO still accurate?  I'm not sure what's to do here.