Added stuff for e2
added preliminary p1