does this need to be this branch? Also, can you submit the extra cisco code as a patch to upstream?