First commit to cdh4