Cleaned up.  Need to drop GCM.