should we just handle this TODO now?