Update on ES
Update 2 on ES
Started debugging and testing ES