too much scope creep to address this TODO while we're here? your call, I'm not sure.