Added EE stuff from ZD, added libraries