Fixed impl errors, started working on es