Added the beginings of the CDH4 branch