This has already been done.  TODO remove comment.