Initial commit of states copied from cdh5