addressing the TODO while we're here