More 2.2 Work
CentOS is a pain.  Need to set REPO and finish this so it can be released.