Added ES, C*, all logic, etc