Since this is not actually being implemented, remove it from this PR?