More work for enterprise builds.  Almost there.